make fixes for funky sample names