Fixed some issues regarding prefabs