More data limit bug fixes.