Adding some missing stuff, I guess?