Fix first expiry. Add todos for DB sanity check.