Splitting fixes