Done some fixes.