Fixes in compile script

Change-Id: I40cd667fb32caae31b01db1185fac9da37629dd3