Working on BZ 1025093 and other general fixes.