Couple warnings removed