Record.expiration gets a negative value for never expiring records

Plus two very minor fixes.