final couple fixes for 2.0.2