Start fixing prefabs
Minor changes