fix mac build, c++11isms

Change-Id: I91dba6c054511554e90006aa66134b17cca206fe