DEVIDM-94: Various fixes.