Temporary fix for certain moves like protect/fake out, other minor modifications