fixes in sample37