Updates to remove compiler warnings.