Few core changes to avoid errors