Changes to make the deploy work