Fix configure problems