Minor tweaks to pass the linting task