Start fixing 6.0 compiler warnings