OGM-545 Misc improvements;

@DavideD Addresses your remark on the original one + several other minor improvements.