Corrections to configure, work in progress.