Further fixes to #10