Fixes to End of Life