WAR gcc 4.4.7 release bug
Code cleanups