dynamic loading fixes