Some additional fixes.

Up next: interaction model parsing