Update finishers for #61