Apply some fixes