Fix some dead ends created by pillars (#147)