some fixes, ready to test 1.9.1-RC1