Minor fixes, No port of public urls