Removed several warnings ERT-115