Fix some y/x mismatches.