changes for gcc4.8

Change-Id: Ic7daddfe0c298074b644b8c45ba95053cb057836