fixes for RFC URLs