Unity extension fixes for 4.5