Re-did some things that were mercilessly un-did by the rebase fiasco