Fixes to make it work post-renamepocalypse.