Second push, fixes with .js includes