Fixes in Data Import and logging