Small tweaks to the configure script