I thought the patch fixed most of the stuff.