little FPC-related fixes