Further fixes for PR93