Fix regressions, more default values.
Forgot these.
Merge pull request #263 from Heilemann/master

Fix regressions, more default values.