Fix a few more warnings