Additional lint fixes