Handle update -r a little better