pub version 1.6 various sample code fixes