Fixing some optional init issues that prevented compilation; should work on Xcode 6.1 now