Further cleanup of the path and URL mess