Fix require errors

Change-Id: I118015fa754e80465246c163ff1d98706cb6caf5
Fix script compilation errors

Change-Id: I8f24372f5559a4ff168544e9d826c7df3464f7d2