[bug 1045982] Fixed a lot of small things.