More fixes for 9d0538fa94c2d216992aa861fd017d4255bbf969

hey, we need these ^^