Some corrections for 1.0.5.2