Fix a few trivial bugs with new-model LF