wip: sample fixes