Regarding that second change, I remember there was a discussion about that trap and ultimately it was decided that it's a skill trap and should stay the way it is. For some reason I can't find that thread (maybe it was deleted?) but maybe DR admins remember that @Stabbin