Compiling Fix Part 2

Change-Id: Ia446062e38267bcec7f3272236217688c150c220