Improvements for the new source site structure, as well some tweaks