Respond to most lint issues