Update for 2.0.3, 1.8.2