Fixup last compilation and test errors.