various warning fixes

Minor warning fixes