FIX: Minor fixes

Minor fixes to use the proper source space.