Small bug fixes.
Merge branch 'master' of https://github.com/membrane/soa-model