added a couple of patches