stigs: add further changes from jborozan