FIXED: Various fixes to source extraction.