Fix a few naggy compiler warnings