Split/misc fixups

@cpennington pls review