Final fixes of swap Powerup.