fixed some url resolution issues