Some small fixes in Sample 21