Fixes for some minor warnings.