s2d: Fix-up small errors.