BA: overhaultargethandler, fix amphib issues