Fixes to WAP setup