Bring in some more changes from sampleexts