Minor changes related to js include order