dependent destroy and other minor fixes