Random fixes for JS execution