DDBEASY-109 - Various fixes.