Minor compiler warning fix.
Minor clean-ups
Couple of minor cleanups.