fix for 5355 & 5356 comments from demo

Signed-off-by: daniel@efficio.us.com <daniel@efficio.us.com>