DEVIDM-79

Various fixes.