Further fixes from testing