diff --git a/OpenRA.Mods.Common/Traits/Buildings/Bib.cs b/OpenRA.Mods.Common/Traits/Buildings/Bib.cs
index 8e3f1fd112..86c3c0aeee 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/Bib.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/Bib.cs
@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
 {
 	public class BibInfo : ITraitInfo, Requires<BuildingInfo>, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>
 	{
-		public readonly string Sequence = "bib";
+		[SequenceReference] public readonly string Sequence = "bib";
 		public readonly string Palette = "terrain";
 		public readonly bool HasMinibib = false;
 
diff --git a/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs b/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
index 50b014f557..40113e49ad 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits
 		public readonly int[] SouthOffset = null;
 
 		[Desc("The name of the weapon to use when demolishing the bridge")]
-		public readonly string DemolishWeapon = "Demolish";
+		[WeaponReference] public readonly string DemolishWeapon = "Demolish";
 
 		public object Create(ActorInitializer init) { return new Bridge(init.Self, this); }
 
diff --git a/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs b/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs
index 65f03178b6..0568746e4e 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs
@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
 		public readonly bool CancelWhenDisabled = false;
 
 		public readonly string IndicatorImage = "allyrepair";
-		public readonly string IndicatorSequence = "repair";
+		[SequenceReference("IndicatorImage")] public readonly string IndicatorSequence = "repair";
 
 		[Desc("Overrides the IndicatorPalettePrefix.")]
 		public readonly string IndicatorPalette = "";
diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs
index 905e2df069..96fc2b484a 100644
--- a/OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs
+++ b/OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs
@@ -14,7 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Create a palette by applying alpha transparency to another palette.")]
 	class PaletteFromPaletteWithAlphaInfo : ITraitInfo
diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs
index 18c3ed643b..23bde6ab8e 100644
--- a/OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs
+++ b/OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs
@@ -14,7 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Create player palettes by applying alpha transparency to another player palette.")]
 	class PaletteFromPlayerPaletteWithAlphaInfo : ITraitInfo