More changes/fixes to TOU bugs