Fixes for the strbuf api