Tiny changes to frame API