Fixed some fixes.