Fixes, tidying for release