Changed some issues