Updates for GCC 4.6.3 and Linux