Fixes highlighted by Xcode 5.1