Fixed Xcode 5.1 warnings and cleaned up Open Drive