Added checks and fixes designed to deal with the skid