Changes to allow build