some chunking fixes