CRA-754: Some small fixes