Fixing remaining bugs from split.