small fixes [time: 1]