Change some things to make mirroring tools possible