more serialize buffer fixes