Small Fixes to ERD