Demo conent fixes