Lint fixes

@karllindmark good luck with it....