Fix some sampi references