Tools: allow these to work for comm-aurora