Cleanup and fixup before initial release