some fixes II