Fix a couple more warnings