yali: some fixes