[Fpm] Formatting
[Shim] Make shim more secure