Fixes for url detection