Further fixes