Making some fixes