A few changes that didn't make it in the last commit