configuration fix + simplification

/cc @diego