More small changes for batch ubertool use