Added some more patches. Commit messages should be self explanatory. Not sure if this was supposed to be tacked on to the original ticket -- i didn't get a reply on IRC.