Fixed warnings and suggestions.