diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 7df8f7fd5a..64b5940753 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -2273,6 +2273,7 @@ void ResourceFormatSaverBinary::get_recognized_extensions(const RES& p_resource,
 
 	String base = p_resource->get_base_extension().to_lower();
 	p_extensions->push_back(base);
+	p_extensions->push_back("res");
 
 }
 
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 98087e09f9..6a4b81a4a2 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -1410,7 +1410,9 @@ void KinematicBody2D::_bind_methods() {
 
 }
 
-KinematicBody2D::KinematicBody2D() : PhysicsBody2D(Physics2DServer::BODY_MODE_KINEMATIC){
+KinematicBody2D::KinematicBody2D() : RigidBody2D(){
+
+	set_mode(MODE_KINEMATIC);
 
 	colliding=false;
 	collider=0;
diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h
index 82b22066a0..b9452a3b9c 100644
--- a/scene/2d/physics_body_2d.h
+++ b/scene/2d/physics_body_2d.h
@@ -288,9 +288,9 @@ VARIANT_ENUM_CAST(RigidBody2D::CCDMode);
 
 
 
-class KinematicBody2D : public PhysicsBody2D {
+class KinematicBody2D : public RigidBody2D {
 
-	OBJ_TYPE(KinematicBody2D,PhysicsBody2D);
+	OBJ_TYPE(KinematicBody2D,RigidBody2D);
 
 	float margin;
 	bool colliding;