Fix for more recent str/StrBuf changes