Fixed small bugs related to OS X header location