Fixed some more warnings
Some more Wanrings removed