Making branch compilable again