DEVIDM-82: Some minor adjustments.