Further fixes with respect to issue #2256