More warning cleanup ERT-115