Buffer preparation