Changing some fixes