Fixed issues with entities/functions data files.