Fixes for sub instance clone scripts