[Core] Minor compile-time fixes;