Various bug fixes, sample updates
Fix samples