fixes for corpus
fixes