Addressed a number of warnings.