Some fixes with samples