Minor lint fixes