porting changes to test on linux box