DDBEASY-149 - Fixes after CR.