Sync up with newer tool changes