Just updating a couple of fallback things for consistency :ok_hand: