Some fixes for finding destination by name.