calc 3.1 little fixes