Fix issues for older nodejs