diff --git a/BeefLibs/corlib/src/Reflection/AttributeInfo.bf b/BeefLibs/corlib/src/Reflection/AttributeInfo.bf
index 4bbed483..2bdd4254 100644
--- a/BeefLibs/corlib/src/Reflection/AttributeInfo.bf
+++ b/BeefLibs/corlib/src/Reflection/AttributeInfo.bf
@@ -69,6 +69,9 @@ namespace System.Reflection
 			        var attrDataType = Decode!<TypeCode>(data);
 					switch (attrDataType)
 					{
+					case .NullPtr:
+						args[argIdx] = null;
+						break;
 					case .Int8,
 						 .UInt8,
 						 .Char8,
diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp
index 476bae1e..74a266e4 100644
--- a/IDEHelper/Compiler/BfModule.cpp
+++ b/IDEHelper/Compiler/BfModule.cpp
@@ -5614,19 +5614,22 @@ void BfModule::EncodeAttributeData(BfTypeInstance* typeInstance, BfType* argType
 
 	if (argType->IsObject())
 	{
-		if (argType->IsInstanceOf(mCompiler->mStringTypeDef))
+		if ((argType->IsInstanceOf(mCompiler->mStringTypeDef)) || (argType == mContext->mBfObjectType))
 		{
-			int stringId = constant->mInt32;
-			int* orderedIdPtr;
-			if (usedStringIdMap.TryAdd(stringId, NULL, &orderedIdPtr))
+			if (constant->mTypeCode == BfTypeCode_StringId)
 			{
-				*orderedIdPtr = (int)usedStringIdMap.size() - 1;
-			}
+				int stringId = constant->mInt32;
+				int* orderedIdPtr;
+				if (usedStringIdMap.TryAdd(stringId, NULL, &orderedIdPtr))
+				{
+					*orderedIdPtr = (int)usedStringIdMap.size() - 1;
+				}
 
-			GetStringObjectValue(stringId, true, true);
-			PUSH_INT8(0xFF); // String
-			PUSH_INT32(*orderedIdPtr);
-			return;
+				GetStringObjectValue(stringId, true, true);
+				PUSH_INT8(0xFF); // String
+				PUSH_INT32(*orderedIdPtr);
+				return;
+			}
 		}
 	}
 
@@ -5651,6 +5654,19 @@ void BfModule::EncodeAttributeData(BfTypeInstance* typeInstance, BfType* argType
 		}
 	}
 
+	if (constant->mConstType == BfConstType_BitCastNull)
+	{
+		PUSH_INT8(BfTypeCode_NullPtr);
+		return;
+	}
+
+	if (constant->mConstType == BfConstType_BitCast)
+	{
+		auto bitcast = (BfConstantBitCast*)constant;
+		EncodeAttributeData(typeInstance, argType, BfIRValue(BfIRValueFlags_Const, bitcast->mTarget), data, usedStringIdMap);
+		return;
+	}
+	
 	PUSH_INT8(constant->mTypeCode);
 	if ((constant->mTypeCode == BfTypeCode_Int64) ||
 		(constant->mTypeCode == BfTypeCode_UInt64) ||
@@ -5692,6 +5708,7 @@ void BfModule::EncodeAttributeData(BfTypeInstance* typeInstance, BfType* argType
 		for (int i = 0; i < argType->mSize; i++)
 			data.Add(0);
 	}
+	
 // 	else if (constant->mConstType == BfConstType_Agg)
 // 	{
 // 		BF_ASSERT(argType->IsComposite());