fixes from linux box