Clone fixes & various improvements