Fixed on of the JS errors