Fix broken build

Some files had missing changes from the automated lint removal, due to git
weirdness