Fixing Y2K bugs