EMBRYO-28: minor bug fixes