Fixes yet more Unity build errors