DEVIDM-93: Some minor changes and bug fixes.