Minor code updates
Merge branch 'master' of https://github.com/iptc/rightsml-dev.git