Updates for issues caused after splitting JS