Further changes to get rid of warnings in Xcode…