Some labels fix
Other fix in label