[Bug 2552] Corrections