Less defaults, fixes #9