Further fixes to basic functionality