Small sample fixes for #8