Fix a problem with long WATs, add extra debugging info