Fixes yet more errors