Reduced warnings

This branch addresses some code that generates warnings.