extra fixes for possible destination issues