Vid 1551 and vid 1843

Had to cherry-pick some commits after a wee clusterf***.