Split out the better save queue patch