Fix scaffold climbing for the most part