Removed a large number of warnings