Further fixes for issue 2160