Make some fixes