Fix basic sample for latest changes