wai-handler-devel fixes