Fixes #!-sb-unicode build and tests