Few more minor changes to avoid warnings.