Fixes for precompilation failing