More fixes for expire()