another two little fixes