Build fixes for gcc 4.7.

Signed-off-by: Frank Mertens <frank@cyblogic.de>