Recent fixes related to notificaitons expiration dates

Everything's looking good now.  Enjoy.