More compile warning fixes.  Mostly in main.c this time.