Minor bug fix.
Fixes for a few warnings.