Changes to make master build