Fixing some problems with WOZ tools