Some cleanup especially warnings