Some more lint changes, sory for the merge chaos