Fix configure issues