Some more prefab changes