[Shim + Fpm] Cleanup, fixup