- fix some issues so clean clone can work