Added a few shims.