Configure fixes.