Possible problems fixed for SCL-6052 and SCL-6044