- Some small fixes for Unity mode