[Core] Misc changes