fix non-static FP functions
fix use of renamed function