Updated fixes with prefab