Cleaning up warning-generating issues.