Fix core JS