Tweaks to reorder buffer list