Add more missing stuff