CRA-505: Removed some compiler warnings.