WAP minor changes