Some more stuff that was missing