save_samples fixes, fixes #107