Fixes and test results