Machine image fixes

Some minor fixes, plus some examples.