Even more warnings fixed