Fixing compiler warnings, again