[Core] Some fixes