fix others issues