JS Update and corruption fixes