Fix some linting, ref #11