Misc fixes, mostly scenario editing was broken.