Fixes for new lint rules, part 2