Fix up lint errors