Corrected some previous issues.