Fixes to work towards initial release