merge some fixes