1.9: more improvements