fixes for debug drawing mode which appeared after separation of drawing methods