small fixes cue