Multiple bug corrections
Correction bug.