FPE fixes