CRA-505: Bugfixes