Solved some URL-building issues