Demo fixes

https://github.com/mapbox/mapbox-studio/issues/622

@camilleanne want to give this a spin?