stu, before you push an upgrade I perhaps found a couple other bugs that don't seem to trigger CI.