Buffer modifications