Wip clone and misc fixes

Robin Randhawa requested to merge wip-clone-and-misc-fixes into aarch64-rebase Jan 18, 2021