More fixes
Merge branch 'master' of github.com:ssg-org/ssg