Fix gcc 4.6 warnings

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I1382d19e5a7edab5332f72e6cfa6144cd5fcaf0e