Merged the compiler warning fixes into mainstream