Fixing Building Issues

Change-Id: I19b588703e7f0cc52929eb58eaa098c6509014c2