minor fixes
Merge branch 'alternatives' of https://github.com/movsim/movsim into alternatives