Improvments in demo management scripts