Correct several behaviors