FIX: fixes to mixed source spaces post merge

I bet the link Alan Leggitt is broken. Check the bottom of what's new. It should point to your webpage or github page