Start fixing compilation