Fixed samples to comply with changes in code