Fix up lint warnings