fixes in sample and sdk