Correct Diferents issues