Gen III: A few fixes.