Port fixes with proper mixes.