Bugfixes for startcore
Bugfixes for startcore