Make code gcc 3.4 clean