Further fixes for 48a1df65334b