Improve cross configure