more fpm fixes