fixed some linker issues with Xcode 6