Improve sudo behavior