Add a couple more convenience tools for /x work