CRA-534: Fixed some small bugs.