Continue cleanup, allow build on gcc4.6