Fixes for GCC 4.7

Change-Id: Ic72c1277ee6a7201655442445db21b2b60aaa640

Signed-off-by: Daz Jones <yuki@thebronasium.com>