Merge "Fix linting." into main