Fixed tigerw's leftovers.