Tighten up some checks. Fix FPOWI splitting for