Changes to remove compiler warnings in 10.6.