Split/lms bugs

@cpennington please review