More attempted prefab fixes