Modified on server side to fix logging location etc