Updates to fix javascript