More excavator fixes