Fix remaining warnings and save prefab changes