Some small changes to Cue classs