Add fixes.
Fix unit tests.