fixes to bbclone