Minor fixes to 2.X branch for 3.0 (#2526)