Updates in prep for taxonomy hacks