Fix some lint warnings and errors.