[Arrow Mechanism] - Minor Fixes