Fixing issues with clone bundle support.