Fixed 2 compile errors and 2 warnings related to Optional on Xcode 6.1