some tweaks to get demo URLs in place