[master] Small Changes to Configure