Fixed compatibility problems.
Smoke test provided.