Implement some more missing stuff