FF7: More fixes.