More modifications for ambertools.