Fixed compiler compatibility problems