Minor code and compiler warning fixes.