Fixed some more warnings