[FPD] Add proper returns to functions to fix compiling with g++