Removed lots of warnings