Updates to samples and minor fixes to support scripts.