Fix some JS and the exporter