Changes to reduce compiler warnings.