fixes for takeover notif and xcode 5.1