Fixups from the reverts that had to be done