A couple of patches