Some very little fixes