Further fixes following gh-19