[Core] Bugfixes