Update for some fixes