Elevator private fixes