Further gcc fixes