Begins fixing to work on Unity builds