fixes from real tests