Fixed minor issues in arch tool