Merge pull request #452 from metajack/reorg-fixups

Reorg fixups