Fix remaining clone-related issues