Further fixes over - #20