Buffer switching tweaks