Fix basic samples