Fix flake/lint errors