Needed some fixes.