Port switch buffer to use short_paths