Fix compiler competability issues