Elevator Fix and Barrier Fix