Correct issues on server to work offline