Fixes for cloned mode