Minor changes to clean up warnings in Xcode.