Final compilation error fixes for libwapcaplet architecture change