Updated issues 2039, 2044, 2197, 2225, and 2231