Linting fixes

Simple linting fixes. Look ok?