Fixes for URL links