Fixes after porting to run on real Linux server.