Configure fixes