Fixes in the core (Unity)