small fixes for tools