Minor bug fixes (+ happy linter)