Try to make messaging around FP better