fixes from rel v1.0