Fixing EDM meta data being loaded multiple times and other dynamic loading fixes