COAP 22 fix more errors