Updates following FrameCallback changes