Removed warnings (except one).