Complete the integration of Sam Bayer's fixes.
2 files changed