some patches to WATOBO