make project build. some fixes for xcode 6 beta 5