more warning fixes.