changes for gcc4.8

Change-Id: Icc899a64cdd2cc53365903b72961771c7e957a08