Pull changes from emma, fix syntax error in film model.