Started putting some reasonable buffer types in place prior to code generation