Fix baseUrl port checks
Fix merge