A lot of warnings removed