More reorganization bugfixes