Fixes for new Sources