Corrected errors with previous edits