Fix lint warnings where possible.