CDAP-654: minor fixes