I think both of these should be fixed if you patch.