Fixup a few things
Commit fd8fc pushed by Anže Pečar

15 tests 15 passed Duration