Adding changes from the linux box.