Dev XML update

This has no config changes despite my attempting to generate updated configs, so this has to be straight bugfixes :)