Lint fixes

@karllindmark good luck with it....
RAWR :+1: