Improved stability for window commands under Xcode 5