CRA-505 Removed some warnings