Even even more warnings fixed