SAMK- Fixed bugs caused by Xcode upgrades