Fix configure and fix timeouts