CRA-510, CRA-511, CRA-516: Minor fixes.