Some bugfixes. Thanks in advance.
x86 stable
Stopping this in favor of sec bump. *** This bug has been marked as a duplicate of bug 637112 ***