Fixed some errors that prevented the project to compile on xcode (Version 6.1 (6A1052d))