Fixes to previous Edits