[Core] More fixes