Improve compiler compatibility