Minor code changes revolving around source mirroring

Tristan Van Berkomrequested to merge
tristan/source-mirroring-changes into master

This makes a few minor code improvements

Merge request reports