Fix minor issues reported by Lint