Data splitting fixes