Core/Unit: Fix some movement issues when multiple controls are applied