More fix ups for cwtool