fixes for ST3
Merge pull request #1 from pstadler/master

Fixes for ST3