Fixes to check Data directory existence