fix issues encountered upgrading to WAMP 2.5