Bugfixes during cores testing