Minor fixes needed for correctly precompiling