Header fixes because of Xcode Stupidity