More Prefab Fixes