other little fixes