Add some guest changes. A few small script fixes