diff --git a/src/Teleport.cpp b/src/Teleport.cpp
index 8f56adf..d174eac 100644
--- a/src/Teleport.cpp
+++ b/src/Teleport.cpp
@@ -132,6 +132,8 @@ void Teleport::TeleportPlayer(bool get_marker, CVector* pos, short interior_id)
 	}
 	else
 		player->Teleport(CVector(pos->x, pos->y, pos->z), false);
+
+	player->m_nAreaCode = interior_id;
 	Command<Commands::SET_AREA_VISIBLE>(interior_id);
 }
 
diff --git a/src/Vehicle.cpp b/src/Vehicle.cpp
index b51300b..4887e7b 100644
--- a/src/Vehicle.cpp
+++ b/src/Vehicle.cpp
@@ -821,7 +821,7 @@ void Vehicle::Main()
 					ImGui::Spacing();
 
 					int seats = veh->m_nMaxPassengers + 1; // passenger + driver
-					int doors = seats == 4 ? 5 : 3;
+					int doors = seats == 4 ? 6 : 4;
 					int hveh = CPools::GetVehicleRef(veh);
 
 					if (ImGui::Button("All", ImVec2(Ui::GetSize())))
@@ -848,7 +848,7 @@ void Vehicle::Main()
 						}
 					}
 
-					for (int i = 0; i != doors+1; ++i)
+					for (int i = 0; i != doors; ++i)
 					{
 						if (ImGui::Button(door_names[i].c_str(), ImVec2(Ui::GetSize(2))))
 						{