Fixing some warnings.
Removing more warnings.