[Fpm + Shim] Fixed shim and interop with fpm