COOPR-497: fixes according to PR comments