Fix source controller
Fix patches controller
Cleanup
Fix sources controller