small fixes for cue