Removed most warnings