Fixed remaining issues affecting native compiling