Making some minor corrections, including to how the Expires header is generated