Minor adjustments for WAG