FW-133. more little changes due to coap modifications