Removed a bunch of warnings