[split] Tweaks