Changes suggested by @michcioperz & a fail fix