JS path and override fixes