Compiler changes (GCC 4.7, -O3)