Minor sample fixes