More warnings removed