diff --git a/src/common/classes/sparse_bitmap.h b/src/common/classes/sparse_bitmap.h
index c72e7ace60..4b961a4a4a 100644
--- a/src/common/classes/sparse_bitmap.h
+++ b/src/common/classes/sparse_bitmap.h
@@ -24,7 +24,7 @@
  *  Contributor(s): ______________________________________.
  *
  *
- *  $Id: sparse_bitmap.h,v 1.6 2004-10-05 07:03:26 hvlad Exp $
+ *  $Id: sparse_bitmap.h,v 1.7 2004-10-27 09:27:22 aafemt Exp $
  *
  */
 
@@ -145,10 +145,10 @@ public:
 		T val_aligned = value & ~(T)(BUNCH_BITS-1);
 		BUNCH_T bit_mask = BUNCH_ONE << (value - val_aligned);
 		if (tree.locate(val_aligned)) {
-			Bucket *current = &tree.current();
-			if (current->bits & bit_mask) {
-				current->bits &= ~bit_mask;
-				if (!current->bits)
+			Bucket *current_bucket = &tree.current();
+			if (current_bucket->bits & bit_mask) {
+				current_bucket->bits &= ~bit_mask;
+				if (!current_bucket->bits)
 					tree.fastRemove();
 				return true;
 			}
diff --git a/src/jrd/RecordNumber.h b/src/jrd/RecordNumber.h
index 20170b64ae..980f5932fa 100644
--- a/src/jrd/RecordNumber.h
+++ b/src/jrd/RecordNumber.h
@@ -24,7 +24,7 @@
  *  Contributor(s): ______________________________________.
  *
  *
- *  $Id: RecordNumber.h,v 1.3 2004-10-03 04:48:54 robocop Exp $
+ *  $Id: RecordNumber.h,v 1.4 2004-10-27 09:28:26 aafemt Exp $
  *
  */
 
@@ -85,7 +85,7 @@ public:
 
 	inline SINT64 getValue() const { return value; }
 
-	inline void setValue(SINT64 value) { this->value = value; }
+	inline void setValue(SINT64 avalue) { value = avalue; }
 
 	bool isBof() const { return value == BOF_NUMBER; }