Less hackish approach to affinity domain mess
Raw mode fixes