Made fixes for native code compiling