diff --git a/panda/src/bullet/bulletAllHitsRayResult.cxx b/panda/src/bullet/bulletAllHitsRayResult.cxx
index 7d57feb767..953390820e 100644
--- a/panda/src/bullet/bulletAllHitsRayResult.cxx
+++ b/panda/src/bullet/bulletAllHitsRayResult.cxx
@@ -156,7 +156,7 @@ get_hit_fraction() const {
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
-const PandaNode *BulletRayHit::
+PandaNode *BulletRayHit::
 get_node() const {
 
   return (_object) ? (PandaNode *)_object->getUserPointer() : NULL;
diff --git a/panda/src/bullet/bulletAllHitsRayResult.h b/panda/src/bullet/bulletAllHitsRayResult.h
index 26e04034af..6825e0ff68 100644
--- a/panda/src/bullet/bulletAllHitsRayResult.h
+++ b/panda/src/bullet/bulletAllHitsRayResult.h
@@ -33,7 +33,7 @@ struct EXPCL_PANDABULLET BulletRayHit {
 PUBLISHED:
   INLINE static BulletRayHit empty();
 
-  const PandaNode *get_node() const;
+  PandaNode *get_node() const;
   LPoint3 get_hit_pos() const;
   LVector3 get_hit_normal() const;
   PN_stdfloat get_hit_fraction() const;
diff --git a/panda/src/bullet/bulletBodyNode.cxx b/panda/src/bullet/bulletBodyNode.cxx
index c494afe00c..03c24ffaa1 100644
--- a/panda/src/bullet/bulletBodyNode.cxx
+++ b/panda/src/bullet/bulletBodyNode.cxx
@@ -761,7 +761,7 @@ write_datagram(BamWriter *manager, Datagram &dg) {
   dg.add_stdfloat(get_ccd_swept_sphere_radius());
   dg.add_stdfloat(get_ccd_motion_threshold());
 
-  for (int i = 0; i < _shapes.size(); ++i) {
+  for (unsigned int i = 0; i < _shapes.size(); ++i) {
     manager->write_pointer(dg, get_shape(i));
     manager->write_pointer(dg, get_shape_transform(i));
   }
diff --git a/panda/src/bullet/bulletClosestHitRayResult.cxx b/panda/src/bullet/bulletClosestHitRayResult.cxx
index a1b2910b65..acde58087b 100644
--- a/panda/src/bullet/bulletClosestHitRayResult.cxx
+++ b/panda/src/bullet/bulletClosestHitRayResult.cxx
@@ -87,11 +87,11 @@ get_hit_fraction() const {
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
-const PandaNode *BulletClosestHitRayResult::
+PandaNode *BulletClosestHitRayResult::
 get_node() const {
 
   const btCollisionObject *objectPtr = m_collisionObject;
-  return (objectPtr) ? (const PandaNode *)objectPtr->getUserPointer() : NULL;
+  return (objectPtr) ? (PandaNode *)objectPtr->getUserPointer() : NULL;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/bullet/bulletClosestHitRayResult.h b/panda/src/bullet/bulletClosestHitRayResult.h
index 1a3846ab89..dcb9e325b9 100644
--- a/panda/src/bullet/bulletClosestHitRayResult.h
+++ b/panda/src/bullet/bulletClosestHitRayResult.h
@@ -38,7 +38,7 @@ PUBLISHED:
 
   bool has_hit() const;
 
-  const PandaNode *get_node() const;
+  PandaNode *get_node() const;
   LPoint3 get_hit_pos() const;
   LVector3 get_hit_normal() const;
   PN_stdfloat get_hit_fraction() const;
diff --git a/panda/src/bullet/bulletClosestHitSweepResult.cxx b/panda/src/bullet/bulletClosestHitSweepResult.cxx
index 7c4a12c336..6245495490 100644
--- a/panda/src/bullet/bulletClosestHitSweepResult.cxx
+++ b/panda/src/bullet/bulletClosestHitSweepResult.cxx
@@ -67,11 +67,11 @@ get_hit_fraction() const {
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
-const PandaNode *BulletClosestHitSweepResult::
+PandaNode *BulletClosestHitSweepResult::
 get_node() const {
 
   const btCollisionObject *objectPtr = m_hitCollisionObject;
-  return (objectPtr) ? (const PandaNode *)objectPtr->getUserPointer() : NULL;
+  return (objectPtr) ? (PandaNode *)objectPtr->getUserPointer() : NULL;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/bullet/bulletClosestHitSweepResult.h b/panda/src/bullet/bulletClosestHitSweepResult.h
index 6d142452b0..7ff7e524b4 100644
--- a/panda/src/bullet/bulletClosestHitSweepResult.h
+++ b/panda/src/bullet/bulletClosestHitSweepResult.h
@@ -38,7 +38,7 @@ PUBLISHED:
 
   bool has_hit() const;
 
-  const PandaNode *get_node() const;
+  PandaNode *get_node() const;
   LPoint3 get_hit_pos() const;
   LVector3 get_hit_normal() const;
   PN_stdfloat get_hit_fraction() const;
diff --git a/panda/src/bullet/bulletContactResult.cxx b/panda/src/bullet/bulletContactResult.cxx
index b9adc65c75..f65d66928f 100644
--- a/panda/src/bullet/bulletContactResult.cxx
+++ b/panda/src/bullet/bulletContactResult.cxx
@@ -63,7 +63,7 @@ BulletContactResult() : btCollisionWorld::ContactResultCallback() {
 #if BT_BULLET_VERSION >= 281
 ////////////////////////////////////////////////////////////////////
 //     Function: BulletContactResult::use_filter
-//       Access: Published
+//       Access: Protected
 //  Description: 
 ////////////////////////////////////////////////////////////////////
 void BulletContactResult::
diff --git a/panda/src/bullet/bulletPersistentManifold.cxx b/panda/src/bullet/bulletPersistentManifold.cxx
index 4d345294e6..f356f6efe0 100644
--- a/panda/src/bullet/bulletPersistentManifold.cxx
+++ b/panda/src/bullet/bulletPersistentManifold.cxx
@@ -63,7 +63,7 @@ clear_manifold() {
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
-const PandaNode *BulletPersistentManifold::
+PandaNode *BulletPersistentManifold::
 get_node0() {
 
 #if BT_BULLET_VERSION >= 281
@@ -72,7 +72,7 @@ get_node0() {
   const btCollisionObject *obj = (btCollisionObject *)_manifold->getBody0();
 #endif
 
-  return (obj) ? (const PandaNode *)obj->getUserPointer(): NULL;
+  return (obj) ? (PandaNode *)obj->getUserPointer(): NULL;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ get_node0() {
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
-const PandaNode *BulletPersistentManifold::
+PandaNode *BulletPersistentManifold::
 get_node1() {
 
 #if BT_BULLET_VERSION >= 281
@@ -89,7 +89,7 @@ get_node1() {
   const btCollisionObject *obj = (btCollisionObject *)_manifold->getBody1();
 #endif
 
-  return (obj) ? (const PandaNode *)obj->getUserPointer(): NULL;
+  return (obj) ? (PandaNode *)obj->getUserPointer(): NULL;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/bullet/bulletPersistentManifold.h b/panda/src/bullet/bulletPersistentManifold.h
index 0e63c48c08..ee976739c9 100644
--- a/panda/src/bullet/bulletPersistentManifold.h
+++ b/panda/src/bullet/bulletPersistentManifold.h
@@ -32,8 +32,8 @@ class EXPCL_PANDABULLET BulletPersistentManifold {
 PUBLISHED:
   INLINE ~BulletPersistentManifold();
 
-  const PandaNode *get_node0();
-  const PandaNode *get_node1();
+  PandaNode *get_node0();
+  PandaNode *get_node1();
 
   int get_num_manifold_points() const;
   BulletManifoldPoint *get_manifold_point(int idx) const;