FLOE-228: Changes to fix validation errors.