More compile warning fixes.