Made some minor fixes that I found when deploying demo