[HOLY TITS MERGE THIS] Fixes Hulk server crash bug and also a couple typos

Fixes #6714