Finish fixing remaining warnings.