Clone fixes.