fix errors due to upgrade and add back missing files
fixing js