New little fixes