Tweak buffer mappings for w