small fixes after split.