Patches from bugzilla