CRA-534
Minor fixes