Fix powerup_basic warnings after merge