Fixes for loading up of external data