Some fixes for unity