compilation fixes to JS files
Merge branch 'ql-refactor' into sam_ql_refactor_compile