Making some fixes.