More auto fixing.