Attempting to fix gcc 4.4 builds