Removed a lot of warning.