Fix small bugs in fpm handling to keep GCC quiet