fix some issues 3