Another lint fixes