Add tentative fixes

For #1215.