More attempts to sort out the frame-rate issues.