Minor changes to remove compiler warnings.