some fixes due to problems with coqc-8.16.1