Transform and Entity Fixes