Some changes for a correct behaviour in the production server.