Fixes to use JS for file includes