more changes from linux box