Swapped around some of my buffer mappings again