Fixed powerup bugs that were introduced by last merge