A few changes somehow left out of the testing branch