Eliminate a couple HEAD calls