These little fixes...