fix for MessagesMixin and tweaks to urls