Some fixes and test.