Minor changes to mirror source