Fix a few places where frame data was used directly.