#2 little fixes