Second attempt on fixing the compiler warnings.