fixes for samples