Fixing file watching + js concat support