Some minor tweaks to get rid of mirrors