Fix several lint warnings