a couple of little fixes