Fixes for sub instance cloning script