Fix #1, several compile errors remaining from Xcode 6 Beta