Changes around lint