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

22 tests 22 passed Duration