Fix some compiler bugs for Rogue combat updates