Fix some things I missed around surrogates