More FP fixes. I hate FP.