Basic housekeeping post fork
Fix namespaces etc