Update some fixes