fixes for using gcc 4.8

Change-Id: I9bcb9f751afbf41150d5923d5893f3bf79e9d2b7