Fixes on comparison screens, work as expected on test system.