Make Flake8 happier
Unbreak test
Unbreak navigation