Minor fixes (+3 squashed commits)
Squashed commits:
[4e819e3] Minor fixes
[1fb880b] Minor fixes
[d120118] Minor fixes

Minor fixes

Minor fixes

Minor fixes
Merge branch 'develop' of github.com:starteam/starx into develop

* 'develop' of github.com:starteam/starx:
  Minor fixes
  Minor fixes
  Minor fixes
  Minor fixes