Changes for work on linux production and on local development