Fix a few more compiler warnings