[FP] Some more changes