A few changes after trying to deploy