More configuration parsing fixes #30