Fix lint warnings/errors