Other warnings removed