Changes to support more recent libtools