Bunch of changes that were sitting around waiting to be committed