More bug fixes
Add source_exclude