import some more missing stuff