Minor fixes
Merge branch 'master' of github.com:infinity-se/infinity-bootstrap