Finishes fixing to work on Unity builds