Merge "Fix "npm run build" errors"