* Fix minor regressions introduced with 2.13.1