COMP: More warnings removed