Minor tool cleanups