EMD Things and ED Bug Fixes