Several small changes

I commit them in order to change the workstation