More fixes
Commit 83175 pushed by Anže Pečar

15 tests 15 passed Duration