Shove and Slay Fixes