Last little fixes