Merge pull request #574 from intportg/dev

Misc fixes