Update to latest packages.  Things have really changed a lot in WAI