Further fixes to basic functionality
Fixes to basic functionality
Misc