Small patch to supress some of the compiler warnings.