Fixes in wapcaplet