FIX: fixes to mixed source spaces post merge