Bug fixes and tests.