Fixes for trapping abilities