a couple of patches applied