Fixing paths to data calls