Fixed some minor issues reported by Xcode [ci skip].