Corrected some issues with Unity