More WAI updates
Attempt to fix some RPT variable spam.