extra fixes for possible destination issues

subclasses in different pr