3 little fixes