Running in the Y2K: Minor Fixes

Minor stability fixes have been implemented.