Correcting some issues.