More stuff from main repo pull requests