Better expire checks