Add some &&s to configure