CMCTP-1: some minor fixes