Autosource in SFs where applicable (fix #944)