[Core] Fixes