Merge some fixes