Update files to fix load and reference errors