COAP 22 some initial code error fixes