Fixes and test.